* cl.el (cl-floor, cl-ceiling, cl-truncate, cl-round): Renamed

	from floor, ceiling, truncate, and round; the old names conflict
	with built-in functions.

diff --git a/lisp/cl.el b/lisp/cl.el
index b897603ab47ffe0e9a28478f981b0e04e6dc72f8..2d2179b78bc0ee2e67d66a20c05f38cbb47b69d3 100644 (file)
--- a/lisp/cl.el
+++ b/lisp/cl.el
@@ -1724,7 +1724,7 @@ equal to the real square root of the argument."
                  done   (or (= new approx) (= new (+ approx 1)))
                  approx new)))))
 \f
-(defun floor (number &optional divisor)
+(defun cl-floor (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward minus infinity.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1744,7 +1744,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                     (let ((q (- (+ q 1))))
                       (values q (- number (* q divisor)))))))))))
 
-(defun ceiling (number &optional divisor)
+(defun cl-ceiling (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward plus infinity.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1761,7 +1761,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                  (t
                   (values (- q) (+ number (* q divisor)))))))))
 \f
-(defun truncate (number &optional divisor)
+(defun cl-truncate (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding toward zero.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case
@@ -1778,7 +1778,7 @@ DIVISOR defaults to 1.  The remainder is produced as a second value."
                  (t                     ;same as ceiling
                   (values (- q) (+ number (* q divisor)))))))))
 
-(defun round (number &optional divisor)
+(defun cl-round (number &optional divisor)
   "Divide DIVIDEND by DIVISOR, rounding to nearest integer.
 DIVISOR defaults to 1.  The remainder is produced as a second value."
   (cond ((and (null divisor)            ; trivial case